bitkeeper revision 1.1648.1.1 (429f74a466gMuUJnqOh6jpVeBCjqyg)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xxx.bk

diff --cc xen/arch/x86/x86_32/seg_fixup.c
Simple merge

diff --cc xen/include/xen/sched.h
index 43d218fc0051f15ad0f7ad8632fdf3812915025a,bca07fe1e4c8cbebbd612ba309dee53f7fe9e350..281e830451998cc9fb4c24177f741bdd7318b1fb
--- 1/xen/include/xen/sched.h
--- 2/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@@ -166,10 -167,12 +166,10 @@@ struct domain_setup_inf
      unsigned int xen_elf_image;
  };
  
 -#include <asm/uaccess.h> /* for KERNEL_DS */
 -
  extern struct domain idle0_domain;
- extern struct exec_domain idle0_exec_domain;
+ extern struct vcpu idle0_vcpu;
  
- extern struct exec_domain *idle_task[NR_CPUS];
+ extern struct vcpu *idle_task[NR_CPUS];
  #define IDLE_DOMAIN_ID   (0x7FFFU)
  #define is_idle_task(_d) (test_bit(_DOMF_idle_domain, &(_d)->domain_flags))
  
@@@ -263,15 -266,17 +263,15 @@@ extern void sync_lazy_execstate_cpuset(
  extern void sync_lazy_execstate_all(void);
  extern int __sync_lazy_execstate(void);
  
- /* Called by the scheduler to switch to another exec_domain. */
+ /* Called by the scheduler to switch to another vcpu. */
  extern void context_switch(
-     struct exec_domain *prev, 
-     struct exec_domain *next);
+     struct vcpu *prev, 
+     struct vcpu *next);
  
- /* Called by the scheduler to continue running the current exec_domain. */
+ /* Called by the scheduler to continue running the current vcpu. */
  extern void continue_running(
-     struct exec_domain *same);
+     struct vcpu *same);
  
 -void domain_init(void);
 -
  int idle_cpu(int cpu); /* Is CPU 'cpu' idle right now? */
  
  void startup_cpu_idle_loop(void);